auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 28 Dec 2012 12:37:19 +0000 (13:37 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 28 Dec 2012 12:37:19 +0000 (13:37 +0100)

Trivial merge